Typo fixes

Fix s/occurence/occurrence in many places.

diff --git a/README.in b/README.in
index 41649264bdb2ba888823154c93d0c089ee70ca8d..d0884ec25249a3924b77f5ef92d3e6f04afe225a 100644 (file)
--- a/README.in
+++ b/README.in
@@ -53,7 +53,7 @@ In the bug report please include:
   of software that can be downloaded.
 
 * If the bug was a crash, the exact text that was printed out
-  when the crash occured.
+  when the crash occurred.
 
 * Further information such as stack traces may be useful, but
   is not necessary.

diff --git a/gtk/compose-parse.py b/gtk/compose-parse.py
index 16cc50095ee9fdb5617578976448e48c92ad27d3..9a6513a70ae5deb1368f0828da294de98e996899 100755 (executable)
--- a/gtk/compose-parse.py
+++ b/gtk/compose-parse.py
@@ -811,9 +811,9 @@ if opt_gtk:
        ct_index = start_offset
        for line_num in range(len(compose_table)):
                for i in range(WIDTHOFCOMPOSETABLE):
-                       occurences = compose_table[line_num][i+1]
+                       occurrences = compose_table[line_num][i+1]
                        compose_table[line_num][i+1] = ct_index
-                       ct_index += occurences * (i+2)
+                       ct_index += occurrences * (i+2)
 
        for sequence in xorg_compose_sequences:
                ct_second_part.append(map(convert_UnotationToHex, sequence))

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 1b2962cc3618281275c3f92466465f45347ba9a8..ec2982bdbb3f5881d6bec35b4813790324c9fcf3 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -215,7 +215,7 @@ gtk_css_provider_class_init (GtkCssProviderClass *klass)
    * @section: section the error happened in
    * @error: The parsing error
    *
-   * Signals that a parsing error occured. the @path, @line and @position
+   * Signals that a parsing error occurred. the @path, @line and @position
    * describe the actual location of the error as accurately as possible.
    *
    * Parsing errors are never fatal, so the parsing will resume after
@@ -1810,7 +1810,7 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
  *
  * Returns: %TRUE. The return value is deprecated and %FALSE will only be
  *     returned for backwards compatibility reasons if an @error is not 
- *     %NULL and a loading error occured. To track errors while loading
+ *     %NULL and a loading error occurred. To track errors while loading
  *     CSS, connect to the #GtkCssProvider::parsing-error signal.
  **/
 gboolean
@@ -1858,7 +1858,7 @@ gtk_css_provider_load_from_data (GtkCssProvider  *css_provider,
  *
  * Returns: %TRUE. The return value is deprecated and %FALSE will only be
  *     returned for backwards compatibility reasons if an @error is not 
- *     %NULL and a loading error occured. To track errors while loading
+ *     %NULL and a loading error occurred. To track errors while loading
  *     CSS, connect to the #GtkCssProvider::parsing-error signal.
  **/
 gboolean
@@ -1891,7 +1891,7 @@ gtk_css_provider_load_from_file (GtkCssProvider  *css_provider,
  *
  * Returns: %TRUE. The return value is deprecated and %FALSE will only be
  *     returned for backwards compatibility reasons if an @error is not 
- *     %NULL and a loading error occured. To track errors while loading
+ *     %NULL and a loading error occurred. To track errors while loading
  *     CSS, connect to the #GtkCssProvider::parsing-error signal.
  **/
 gboolean

diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 760b60786ab3e3c8c56fa63c89d4fc8a91bb302d..16d2ef222e9f073f7b5f957a52cb897da8345dee 100644 (file)
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -165,7 +165,7 @@ struct _GtkPlacesSidebar {
 
   guint mounting               : 1;
   guint  drag_data_received    : 1;
-  guint drop_occured           : 1;
+  guint drop_occurred          : 1;
   guint show_recent_set        : 1;
   guint show_recent            : 1;
   guint show_desktop_set       : 1;
@@ -1877,7 +1877,7 @@ drag_data_received_callback (GtkWidget        *list_box,
 
   g_signal_stop_emission_by_name (list_box, "drag-data-received");
 
-  if (!sidebar->drop_occured)
+  if (!sidebar->drop_occurred)
     return;
 
   target_row = gtk_list_box_get_row_at_y (GTK_LIST_BOX (sidebar->list_box), y);
@@ -1949,7 +1949,7 @@ drag_data_received_callback (GtkWidget        *list_box,
     }
 
 out:
-  sidebar->drop_occured = FALSE;
+  sidebar->drop_occurred = FALSE;
   gtk_drag_finish (context, success, FALSE, time);
   stop_drop_feedback (sidebar);
   g_free (target_uri);
@@ -2012,7 +2012,7 @@ drag_drop_callback (GtkWidget      *list_box,
   gboolean retval = FALSE;
   GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
 
-  sidebar->drop_occured = TRUE;
+  sidebar->drop_occurred = TRUE;
   retval = get_drag_data (sidebar->list_box, context, time);
   g_signal_stop_emission_by_name (sidebar->list_box, "drag-drop");
 

diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 1a906e0cce43f3489c14aa5c098cb8342850b9f3..3ae0ed492429471d53b5f0cda67f206ab157062f 100644 (file)
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -81,7 +81,7 @@ typedef enum {
 
 /**
  * GtkPrintOperationResult:
- * @GTK_PRINT_OPERATION_RESULT_ERROR: An error has occured.
+ * @GTK_PRINT_OPERATION_RESULT_ERROR: An error has occurred.
  * @GTK_PRINT_OPERATION_RESULT_APPLY: The print settings should be stored.
  * @GTK_PRINT_OPERATION_RESULT_CANCEL: The print operation has been canceled,
  *     the print settings should not be stored.

diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 20ced2a2bc481aa37a28fe6c7614af56c016bb90..4220fa426f989f0610ac2a96c17ce50d9ea75647 100644 (file)
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -3839,7 +3839,7 @@ gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer,
   /* When pasting with the cursor inside the selection area, you
    * replace the selection with the new text, otherwise, you
    * simply insert the new text at the point where the click
-   * occured, unselecting any selected text. The replace_selection
+   * occurred, unselecting any selected text. The replace_selection
    * flag toggles this behavior.
    */
   data->replace_selection = FALSE;

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 13d234f96d1341ec4c2ad10dad95a31116fa66ec..1f20889b7e995fbf6032c52151ef9d592dc8b2a1 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -860,7 +860,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
    * @tag: the #GtkTextTag on which the signal is emitted
    * @object: the object the event was fired from (typically a #GtkTextView)
    * @event: the event which triggered the signal
-   * @iter: a #GtkTextIter pointing at the location the event occured
+   * @iter: a #GtkTextIter pointing at the location the event occurred
    *
    * The ::event signal is emitted when an event occurs on a region of the
    * buffer marked with this tag.

diff --git a/m4macros/gtk-3.0.m4 b/m4macros/gtk-3.0.m4
index 4838f16a4debfc98895df413d84b96c1e582cfa7..4fc99064c27fe2e246d192b8b2ff2e7b5a105ec1 100644 (file)
--- a/m4macros/gtk-3.0.m4
+++ b/m4macros/gtk-3.0.m4
@@ -178,7 +178,7 @@ main ()
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi